tweak some stuffs