added comments and set Id for field