image improvements and fixes