Partial commit of changes, mostly minor
STASH-COMMIT: local/foreign character creation problems