Enhancements and bug-fixes