Bug fixes and additional balance tweaking