balancing/bug fixes