hmw4 - remaining edits