More number fixes, should now be working