Bug fixes. This version appears to work well.