Moved some of the Character Screen stuff out to the right place. Blocked off the broken upgrade code in the wizard tower.