edits and [hopefully] tags updated