some changes fixed