Improving documentation

Further improvements for clarity and to correct errors.