Bug fixes and paincrit balances