Add sounds, check completed and refactoring