Fixed some comments and updated timestamp