More minor changes/edits