Added movement with up+down arrows.
Fixed some issues introduced on previous releases