fixed handling of geokrety waypoints, corrected indents, updates #18

see email a few minutes ago...