Clean up tweaks-lots