Add update_account! method with fixes and one clear commit