fix #108 fix #125 fix #126 and changes in other related classes