Yet more optimization tweaks
More tweaking. Added a couple more highlights