bugs fixes for second round specially date/time fixes