miscellaneous fixes; start transitioning away from classes