Blade enhancements and bug fixes