update comments//removed fatal stuff//add customField error handling