Use shorthand syntax
Fix terrain function (had x and y swapped)