More work on terrain