fix #91

Also rewrote things to match other models a bit more
Updated image tests