Lots of fixes and enhancements, nearly ready for release!