Couple of bugfixes. Figure3 is more compact.