fix a couple of mugging bugs and rebalance
more rebalancing