Issues #1 and #2, updated context completion logic