Fix audio, better index formatting