Minor tweaks & edits