Add meaningful IDs, and use them.
Merge pull request #11 from jglick/manual-tweaks

Add meaningful IDs, and use them.