Issue fixes for #10, #12, and #14.