Resolved some bugs and added score display