Fixed the skip mechanism, among other small fixes.  Also added copious c...

...omments.

It's just a start, more to come.  Might also be easier to work within a branch of the master fair-ubuntu-centre, but I need permission first :)