PlayerChar.java and minor changes