Ease # comments detection; fix regexp error