-add tombstones to everything -encase obstacles in their own struct -put spell kaos in their own include files -store save-data of spell knowledge -encapsulate warp function