I see that your proposal has already been moved to phase-3: GIP-61: Shall GnosisDAO fund BootNode as a Core Contributor Team? - #10 by mgarciap
This is the formal guide: README: GnosisDAO Governance Process
That is correct. The total supply has been reduced to 3M GNO. This amount includes both the circulating and non-circulating supply of GNO.