More value checking in Comment
Fixes a few bugs/typos in comment