Feature/small improvements