Feature/fixing issues