Fix comments bug and add default values for timestamp