Some improvements and a few doc tags.