NOJIRA: bringing this project current; many, many changes.