Took care of #6, #7, #8, #9, #10, #12, #14, #15, #16, #17, #18, #20