fix issues on Account.java 

Closes #1, Closes #8