Some changes based on a newer version of the Schunk manual