assortment of small cleanups