Make some tweaks