Couldn't resist updating again, but wasn't working properly when uploaded alongside the other updates, so I'm posting it separately. At this point, it works better with WAI than with Hoseki (Works very well with Hassaku too, apparently.)