did some things, added some other things