Fix for issue #7 and a few other things I found along the way.