Some final bug fixes to RPG project