Feature/small changes