added energy units

and added more force units