Typos and code mods
Merge pull request #26 from esc24/geoserver_fixes

Typos and code mods