Minor bug fixes and balance changes