lots of cleanup/reorg; rename Score to Error