Edits and Fixes