Code cleanup, and updated html help contents.