Feature/various fixes