Edits for 4/8

see Trello for more details