lots of fixes
Merge branch 'master' of https://github.com/blockstrap/framework
better txs for dashboard