fixed some bugs in drawing, and cleaned up the score screen