All issues 7 - 30 (except 25, 22) fixed