Multiple Changes

- rearrange things, mostly...
- added a few options
- not really tested...
- need to consider h264?