housekeeping edits, make sure correct