some afterwards edits