added review timestamps
fixed issues
fixed merge conflict with timestamps