cleaned up some compiler warnings and constants
Merge pull request #705 from ZappoMan/bug_fixes

cleaned up some compiler warnings and constants