end of night -- just a couple small bugfixes