Fixed marvin's mistakes