closing #26, #27, #28, #29, #32, #33, and #35 from internal ticket system