Readability and other minor edits

Noticed a few errors so created a fork and fixed a few things. Tried to make commits as granular as possible