Bug fixes, Updated to TERRAINMANAGER-2 and TERRAINMANAGER-1