fix some scoring bugs, some code cleanup
remove a lot of debugging output