fix audio somewhat and some cleanup