- Bugfixes
- Minor code cleanup