More edits to HWE