Addresses Bugs 4,6,8,10, Enhancements 7,8,10,21,23 [1074]