Fixed score bug, and minor cleanup