bugfix and image update