More edits.

This is some work in progress edits but feel free to merge at anytime.