fixes #114
fixes #113
fixes #111