added raw image plotting
cleanup