Fixed some things i broke with the previous clean up