Minor tweaks now that this is a 'finished' project