Fixes

various enhancements / fixes