formatting issues and shop corrections