changed title, more edits