Added support for OL

- Added support for OL
- Minor bugfixes