Final-ish build
Balencing and tweaks