New scanner and score modes, fix bugs