fixes #11
fixes #9
fixes #8