small changes; WARNING: there may be a bug in nrtwafom or msnrtwafom