Fix bug, and remove unused variables
Add option to enable/disable "strict math" and "strict units"