fixes for images, formatting ...etc