Add 023-025 and add audio for 021. Fix makefile.