Fix kill-line regression and generally better behaviour