Bug fixes and balance changes