finish (?) streamlining main yorick plug-in