Fixes

I have about 30 version on my hard drive, and I"m trying to get
everything straightened out.