bunch of miscellaneous changes