changed some things some where