Energy system updates

Added capacitors, two types of generators, energy transportation
changes, etc