Added ability to deal with millions, but still bugs