Simpler expanded image stuff
More fixes