@arcnmx has been doing a bunch of work over on that fork, I would like to port those changes here if possible