Bug fixes, new image markup wrapper.