bug fix!
bug fix and small changes
some changes