lots o tweaks