bug fix and more features