more score/timer stuff
merge