bug fix and more