minor tweak and fixes