a few minor tweeks for now