Fixing various bugs and removing an image...