Multiple changes

- Minor updates to math quantity.