further edit and formatting fixes