Yes to both, that was the intention! Will update the text in the next printing.
Thanks! Much appreciated. Again, love the game, makes me draw scenes from time to time
