Bug fixes, more images!