Image Type removed and little fixes