Score tweaks, bug fixes