misc edits
Misc edits and fixes