just a few random tweaks