added function type defs and such
Merge branch 'master' of github.com:davewx7/Citadel