Thank you! I appreciate the feedback.
Regarding upgrades: There are indicators in the shop saying "Unit" and "Upgrade" to distinguish between them. The ratio of new units and upgrades in the shop depends on the difficulty, the number of units you already have, and, of course, some randomness.