Updated to reflect state of the codebase.

Almost time for a new release - I'll await any feedback first
though...