Score stuff and more polish awesomeness