Numerous fixes, ENHANCEMENTS