minor tweaks i need to run past matt