Misc Edits

https://app.asana.com/0/11612587308988/11907624670929/f