a bunch of maintenance changes