Some more score parsing fixes, looks like most stuff is OK now.