edits and changes to several files