Balancing classes, minor updates