Regex improvements/bugfixes

Including wordbreaks for keywords, fixing regex for multi-line comment