Major fixes, updates-2 for end reset feature
Encapsulation for endreset classes
Major cleanup