some corrections proposed by ashtophet