Small Tweaks to the energy system, works kinda well for the most part

Signed-off-by: ShadowChild <shadychild12@gmail.com>