Feature/fix some errors