made some small chnages