More fixes, redid a bunch of SPRK, so far everything I've tested works fine.
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git