Feature/bugfixes 1