Finished doing Account.java tweaks