Edits

Started some edits here, but hit some issues; raising them separately.