Fix where image is grabbed for item.
Formatting fixes.
Add getImage() to Entity.
Merging.
Merging, again.