Bug fixes, image improvements