latest changes and fixes