More minor tweaks and edits