Minor edits & bug fixes