refactoring sound control + some fixes
Merge remote branch 'halaszk/master'