more fixed and tweaks