more random tweaks