Updated with latest changes

Added 6.16-6.18. Possibly more commits for these releases, but better that we get something down.

Maybe it would be worth tagging releases?