better number detection...