minor tweaks and edits