I've committed your changes and some more of my own, so this would be a 
great time to make sure everything still works :)

Thanks again for your efforts,

Jeff