Puzzled Hive: Debug

Fixed progress-blocking issues in Level 18 / Level 38 Other bug fixes