Lots of small improvements and new style options from Nils and Robin.