Minor capitalization fix
Reorganized some chapters, minor text modifications
Updated to changes in 2.1 APIs