Fixed copy-constructor issue with more complex vector types
Reverted some changes to the image system, now supporting 2D images only