Code Clean up with further improvements and bug fixes
Code clean up together with further improvements to quest system and bug
fixes.