Develop

Smaller bugfixes