Cleanup; general improvements to usage; Adds mp4 only mode