You are correct. Total # of masks for a modern IC can be 30-50 or possibly more. And with double and even quad patterning on the critical layers, that's 2 or 4 masks for a single layer.