Improved and simplified some passages