Lots of fixes in CVS, new release soon

Version V1 V2  
1 by Jason Harris View Revision