balancing, name changes, small cleanup for cmd line