fixes #83
fixes #85 and fixes #86
fixes #84