added timestamps, working on comments