Fix scoring and some new comments