some changes to a lot of things