fixes and more readline-vim related removals
fixes and more generic