quick fix for timekeeping and a little wms work