two error corrections, other minor changes