More HSoM edits