Boom it did get fixed I'm so amazing

More cleanup as usual