Improvements and fixes.