Phenomenon Units + Timestamp fix