Some fixes, but balancing doesn't work
broken state with bubbleUp
for submission