balancing, tweaks, fixes