Some Changes, and added Pumps to Energy

up next, pipes xD