TIMESTAMP and Comment

Sorted out timestamp and comment bugs