Feature/some fixes and merge dev