Minor changes, reorganization.