assortment of random changes/fixes