Halloween Update Partial Fix

Fuck it, if it bothers me enough, I'll fix it more later.