Swap alter and 2
Scrollable cursor improvements

Also, comment and tidy