updated for C-d/u/f/b, date format, messages