Move syntax checks and add some mkvmerge options