Small mods
Added regular expressions
Small Tewaks