More tweaks
Regexp notes