Feature/nits