Minor edits and tweaks