The scolding over the fighting (and subsequent reaction) sounds perfect to me - Klaus had to get his sense of justice somewhere. ;)
Author's Response:
I could never see Klaus as a bully. It would so detract from his heroic side! Glad you liked it.