Feature/fix issues