- Bugfix
- Some small changes