Ah I see, I was on mobile previously so that option didn't come up for me.

Alright reading through it, this seems fine. I'm hesitant to allow the Swashbuckling fighting style however, dex/str+charisma will ensure a lot of hits happening. Instead I will allow this: Swashbuckling can do additional damage equal to your charisma modifier, but only one finesse weapons.