Fixed some things I missed in the refactor
Fixed some things I missed in the refactor

creiht/formic,gholt/formic,gholt/formic,wreese/formic,wreese/formic,pandemicsyn/formic,pandemicsyn/formic,creiht/formic