misc tweaking