fixed comments bugs. add time stamps