small tweaks per vince's request