More progress with terrain demo