More bug fixes. Updating scoreboard mechanism.