To respond to the first one, yes, I've got that added to my skills. I'm sure this is all quite simple, but I'm not seeing it.
The issue really isn't with applying damage with weapons, et cetera, although I'd be curious to find out how to remove the Normal Attack option with using a weapon, but...