Updated score updating
Added scoreboard update 
Fixed some bugs