add stream type support in all av options (if necessary), cleanup some code