Further testing and some more minor corrections.