fixed some bugs
Merge branch 'develop' of github.com:senkz/HUSACCT into develop