Tweaks done, some boosts