balance and bugfix