Refactor numerics to use macro helpers
Fix typos