terrain branch tweaks