fixes #831
fixes #829
fixes #831
addresses #832