Feature/bug fixes