Final edits to both files

I added my stuff to both files