Add hints again

I have no idea where they went last time.
Merge pull request #35 from theodi/more-hints

Add hints again