Lots of minor fixes plus better images