various random tweaks.