NIGHTLY - various fixes, enhancements
master