fix more bugs
Merge branch 'master' of https://github.com/keating/future_cadre