few bug fixs 3