bug fix and new features