added color formatting and other formatting fixes