take advantage of new typing features
more fixes and such
Merge branch 'master' of https://github.com/davewx7/Citadel