fixes #63
fixes #62
fixes #61