Refactor sounds and small fixes