More edits

Some small stuff I need Nicole to check in here