some cleanup; make terrain layer default