fixed the wonky wiggle plot and image plot issue. Imageplots have scalesnow
model.png different
fixed merge errors
added return statements