Weapon swap suggestion

Hello, I am playing a monk and have noticed 2 things I want to mention. I think one is a bug, and the other is working as intended, but should be adjusted.

First, when running Ghost Dance your character only generates shrouds while one weapon set is in use. When you swap to the other(whichever it was activated on is the one that will have shrouds) shrouds do not generate. This is not an issue for Wind Dancer. Your stacks are only affected if one weapon set has it turned off.

The second is more of a suggestion. The skill charged staff consumes power charges to give a buff that does extra lightning damage for a time based on the number of charges consumed. When you have 2 weapon sets, each has a separate timer. If I have a skill assigned to one weapon set, and a second to the other, then the timer resets based on which skill I use. As long as both weapons are a quarterstaff the buff should apply.