fixed misc bugs
Merge branch 'master' of github.com:keyaral/Agile