Fix number regex derp, move stuff around