User manual corrections

This PR replaces #357.