The Curse of Zigoris: Improvements and minor bug fixes

Various minor bug fixes and improvements