tweak some minor issues