Added joules and cleaned up force calculations