Some bug fixes

Dev pushed some new commits to the repo, so here is a compiled version of them

Halloween Update fix

Fix is by developer9998, not me.