Improve wording
Add for-attributes to labels
Merge pull request #2 from jwilsson/master

Small admin changes