new file plus some msgs fixed ...