Fixes #634 and #658

*Hey CP! How're things? I have some juicy cap bank fixes for you. I think these might be, at least some of, the ones that made me start my cap bank quest :-D*

**Summary**:
First, only include caps connected with In/Out in expected balance ratio / fill+max numbers.
Second, only include caps connected with In/Out in actual balance operations