more minor tweeks