Added some more stuff. Added layers to maps. Added energy consumption.