tweaks, still not perfect