Some things were majorly f-d up, they have been fixed