Ohori tuples + misc fixes, tweaks