updated timstamp parsing etc.