More bug fixes maybe going to work this time who knows though (php, man)