Fix volume bug and other tweaks