some fixes per @forestwizard