Various fixes + updated images.