Added GEOLOCATION to CSV output and sub items to relevant modules.
Renamed output print functions appropriatel.