Improvements and bug fixes covering some of the open issues