fixes #122
fixes #110
fixes #119