bug fix and more methods