fix 125
fix 123
fix 119, 121, 122
fix 118, 117