Refresher

This contains many updates of which are described in the commit messages.