Added toNumber as well as a few other things