Fix a lot of bugs 'n spiders