finishes issue #10, #12, #13