Testing 168: Tweaks, Fixes and Performance!

Updated OP for Testing 168.1.