energy stuff

-fixed some machine stuff and energy in the works
Merge pull request #6 from imdutch21/master

energy stuff