fixed numerous formatting issues