Generator, kml change and fixes