More edits to main