add comments, remove uncessary error message