Edits and general clean up