Fix conflits and repair spider
Merge branch 'master' of https://github.com/nanarchrist/Mistery into TE_branchedelurgence
fix merge