Numerous corrections #6