fixes #56
fixes #57
fixes #54