Returning better units
Fixing calling of function

No need to pass solver