Bunch of edits based on beta reports