The excursion set approach, and an improved model for the multiplicity function