NOJIRA: minor enhancements to this project before forking again...