Minor tweaks
Checking in files from work machine before I head home for the weekend