Small changes to token parsing and audio event saving