Small changes
Bugfixes