- Upgraded tp latest version of dom-text-*
- Followed API changes
- Added some more error handling