Fix hamlets.
Merge pull request #2 from chiro/fix-hamlet

Cosmetic changes for the hamlets.