More progress towards version 1.2.