Ohori recs WIP:
- initial test script
- misc bug fixes