Feature/fixes