GUI update. added score, moved trap count and sweep.
attempt at resolving merging conflicts
resolving merge conflicts, take two