Now allows adding comments and shows errors