Last minute fixes. Now time for zzZZzz