refactoring sound control + some fixes