br br br removed, some fixes