slifty/torwolf — pull request #2 by Telrikk (2012-09-24 23:27:30+00:00)
Title: Various small corrections from last merge

I made most of the changes you suggested.