Added a bunch of callback insurance - more tests needed though.
Merge branch 'master' of github.com:logmein3546/turbo