Tidy up.
Tidy and more work on updating.
Work on self updating.