Minor edits, mainly Fixes #3