bug fix and features added