Issue #1 and #2 resolved