Fixes, along with working MMSpider now