Character creation works correctly now plus cleanups