minor updates to make it work again