Small edits and fixes