including hydropower objective

many improvements !!!
a lot