Corpse Class Working and other minor changes