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

fix a lot of bugs part 1