New fixes

New revision and a few minor corrections.