misc tweakings