Massively clean up code and fix a bug causing hits to be shared between neighboring paths
Synch up with CVS repository
Add new version