Feature/bug fixes to develop