Added volume settings + minor fix