Fixing up some major number code