Unified variable system
Lots of minor tweaks