Add un-scaled terrain, sky and fix a bug