closes issues 66, 77, 93, and 94.