more tweaks, ahhhhh!