Add images, various small fixes