Changed lines codes to align better with GSMmapper manual plus some minor tuning for waterways