Handling aux output more correctly.  Tested as well.