Updating Files Before (Re)Submission

Just a few knits/changes from the last time around (see comments - I've
already done this assignment previously)