fixed up some scoring bugs