further testing and minor fixes uncovered by the testing