Minor incremental changes - really I'm about to wipe my hard drive and
need to save my stuff somewhere