setvol + other changes