oslecamo, I just remembered that I think the trip attack against me should have missed but that's my fault, I've adjusted my sheet and every single bonus I get is now included in all of the math AND labeled as being included so there won't be any more confusion for anyone.
I don't want to change anything (and I could be wrong about if it missed, there are a whole lot of rolls), I just wanted to explain myself in case some of my bonuses look different.