Multiple fixes & enhancements