refactored account functionality + #178, #232, #250