Thanks, but it looks like we have different gripes. I've put my changes up in a gist as well; check it out to see if they help you too:

https://gist.github.com/1343945