Seol mar théacs é seo: Improvements on Khrapchenko's theorem