Ongoing improvements and fixes.