Tweaks for responsiveness
Updates and fixes