Added Image.cpp, and some tiny changes