some random changes
Merge branch 'jacob1's_mod' of https://github.com/jacob1/The-Powder-Toy into jacob1's_mod