Side Effect: Minor Fixes

Minor fixes, including infinite loop in the Craystal Cave.