Score Popups, Still buggy
Some minor changes