Fixes for resolution, new scoreboard