Improved energy names
Increased Tank buffer (16 buckets now)