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

...nd spaces from the 8 char candidate