just a bunch of changes