Feature/bugfix finish