added few bug fix