ok, now comments are fully implemented