- Added more error handling
- Added Work-around for two WebKit bugs.
- Simplified some internal methods