Issues 8 9 10

Issues #8, #9, and #10 are resolved here.