Small Tweaks

Small speed tweaks