Added scores; some design changes