small stats fix
Merge pull request #473 from daeks/update_fix

Fix: small stats fix
some minor logic changes
Merge pull request #477 from daeks/upd_action

Fix: some minor logic changes
Merge remote-tracking branch 'codiad/master' into tm