number improvements everywhere