bunch of changes

yes changes