Bug fixes, problem with recursive score setting