Add numbers verification, minor fixes.