Various Cleanups and added (sort of) EntityRidgebackSpider