cleaned up return codes and reverted audio changes