Numerous fixes and minor enhancements