Various updates (few fixes).

Mostly more support for reloading, fixed LINC implementation a bit
(incomplete).  Tidied up some other things.