more cleanup
editing opts to work with exec