bug fix and small update