Added Image

Also small fixes of things I broke somehow.