Add no-commercials option and handle another timestamp format