better regex
better error message
fix some logic errors
Merge branch 'master' of github.com:ctSkennerton/scriptShed