Bug fix and balance adjustments