added some more labels everywhere
Merge pull request #42 from rangle/betterLabels

added some more labels everywhere