A few bugfixes and enhancements, espcially around scoring