Added new debug tools and requested features
conflict resolution
Added version changes suggested by albinger