Fixes, amendments and enhancements