some corrections proposed, hopefully for good :-)