fixed comment handling, all comment tests now pass