Feature/bug fix and lite evolutions