- RegExp fix
- code style fix
- err messages added