Fixed a bug with comments after keywords,  trims away dashes a...

...nd spaces from the 8 char candidate