minor tweak and minors fix