That is everything. Only the mass 0 bodies are going to be moons, with only a few big moons as mass 1. Everything else mass 1, 2, and 3 are going to be planets.
Krenshala, question about tidelocks: are those tidelocked to the star or to the moon? Because every planet is going to be tidelocked to its first moon, right? I don't see any differentiation for planets tidelocked to a star or for big moon tidelocks.