some cleanup.  Also fixed qacg output names