Last minute updates

Implements the recommendations from the run through earlier today.