Tweaks

Improvements to speed, stability.