Shitload of stuff I don't like to detail
Fixed and added methods to account