added comments field, bugfix for server errors