Port all TwixKat changes