Fixed more bugs with image export, almost ready for prime time