final update

should have everything working