bug fix and ubgrade