Few more graphics tweaks