energy stuff

-fixed some machine stuff and energy in the works