V13 optimizations

variety of clean-up to ensure a smoother experience all around!