random tweaks here and there.