some small changes to / for aesthetics.
Merge branch 'master' into geoip