Misc fixes, more character generation