Fixed Sound to support source change, other small fixes