fix timestamp field names
fix some errors