Fix more warnings and some style.
Merge pull request #14 from zlangley/warnings

Fix more warnings and some style.