Fix off-by-one issue
Implement audio