Fix mess made in last commit, plus balancing