Reverted some changes that i made to speed up development, but they should not be in the finished build