Improved some changes and fixes