a bunch of changes