Rising Moonshade: Fix some bugs

Fix some bugs. Optimize certain user experiences.