cleaned up, added comments, prepared for 6.2.0.Beta2 release