Slight reorganization of some sections