Accountfixes & formating