fix a bunch of compiler errors
Merge pull request #1 from cgaebel/fix-compile-errors

fix a bunch of compiler errors