Fixes, changes and image