Fix eolPoint' manouvers

Fixes #667 and probably #662 (needs vimtests) and maybe even more.