finishing some changes