some modifications

There are several small modifications in this version compared with the
last one.