- allow only one instance
- some bugfixes