bug fixs updates...