fix a lot of bugs part 2
Merge pull request #136 from bhimasta/bimo.account

fix a lot of bugs part 2