Issue #45 - Bug fixes following testing.