Added world parameter and power map function

Also updated power consumption vars