some tweaks still not working