few JS tweaks WTF..
few JS tweaks WTF..