Fixed a few minor coding style bugs using code inspection
Early character gui
Merge remote-tracking branch 'origin/master'