You are right on both counts! I've clarified both points in the rules, and posted v.1.0.4. Thank you for the feedback! Glad you're continuing to enjoy the game; I'd love to hear how the 2-player mode goes for you. :)
