Bug fixes, small UI improvements, balancing