Various tweaks/edits