Version 6.1

Tied up loose ends.