A bunch of minor changes. Cofibre.