fixup bad rebase
review pass on multidir js