Fixed finish on activites and added SoundPunishment.
Resolved conflicts.