refactoring, fixed up scoring issues, made score more visible