Bug fix (off by one in Image class) + small tweaks