Analysis mode and score tweaks