Added scoring bug fixes etc.