changes to stuff and stuff