Update/fix to local variables
Add units standard library