Crash fix and sounds!