6.9:  fixed a few random quirks.