Added ennergy consumption + bugfixes