Minor edits and fixes made