Various changes to make htings work.
Merge pull request #1 from assertchris/master

Various changes to make things work.