Fixes for Issues #1, 3

Fixes for Issues #1, 3