few other misc tweaks.