Updated to latest version

.. lots of tiny updates from the past few years..