cleaned up, added audio switch