Updated Comment parsing - and made it more fault tolerant