added doc strings and fixed timestamps