Updated to new SourceForge CVS locations, and fix a couple of minor