minor modifications in basic/.