image download bug, small enhancements