Major overhaul to boost code (much more efficient)

Couple more small tutorial tweaks