Feature/bugfixes