bug fix, cleanup, new date