More cleanup, object layer adjustments (static rocks that should receive grass are now on terrain layer)