Issues #32 #38 #44 #43 #42 dealt with