Add comments and small details