pulled in mods from git.kbase.us
added new stuff
brought all up to date. I hope. Let's assume