* Minor edits and fixes