Fixed stuffs that were broke