CLEANED!!! and added scoreboard support =P