Many fixes and image updates