Some improvements and some more documentation.