a second attempt to commit recent changes including new cross shaped tombstones and updates to terrain