fixing untracked files; minor modifications on date handling