bunch of random, sloppy changes