formatting fixes + additions