Audio fix and bug fixes