Some clean up, and made the spawing of Obelisks a lot more efficient