3.0 Number class update

This PR fixes small errors on the previous PR #1700 and update the Spanish branch without translation.
I'll open a seperate PR for the french translation so It can be reviewed separately.