Escape from Norwood: Bug fixing

Miscellaneous bug fixes