1. Yes

2. Yes

Good suggestion! I'll add that to my idea hopper for the monk update I'm working on.