# HG changeset patch
# User Chris Cannam
# Date 1403187849 -3600
# Node ID 4964bfbcbcb4e4c6863f2f7776c20ca81c764d99
# Parent  7255ca84d19a7823859fe575bb3a3b24ac1861ce# Parent  405bff5165dd69de51d8af1bdaf6ee4219ac0b36
Merge from default branch

diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/availability.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/availability.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -0,0 +1,25 @@
+
+@prefix vamp:     <http://purl.org/ontology/vamp/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
+@prefix dc:       <http://purl.org/dc/elements/1.1/> .
+@prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix :         <#> .
+
+@prefix qm: <http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#> .
+
+qm:library
+	vamp:has_source "true" ;
+	vamp:has_binary "osx" ;
+	vamp:has_binary "linux32" ;
+	vamp:has_binary "linux64" ;
+	vamp:has_binary "win32" .
+
+@prefix beatroot: <http://vamp-plugins.org/rdf/plugins/beatroot-vamp#> .
+
+beatroot:library
+	doap:download-page <http://code.soundsoftware.ac.uk/projects/beatroot-vamp/files> ;
+	vamp:has_source "true" ;
+	vamp:has_binary "osx" ;
+	vamp:has_binary "linux32" ;
+	vamp:has_binary "linux64" ;
+	vamp:has_binary "win32" .
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/bbc-vamp-plugins.n3
--- a/plugins/bbc-vamp-plugins.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/bbc-vamp-plugins.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -7,50 +7,60 @@
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
 @prefix cc:       <http://web.resource.org/cc/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix :         <#> .
 
 <>  a   vamp:PluginDescription ;
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins> .
 
-:bbc-vamp-plugins a  vamp:PluginLibrary ;
+:maker 
+    foaf:name "BBC" ;
+    foaf:page "http://www.bbc.co.uk/" .
+
+plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "bbc-vamp-plugins"  ; 
+    dc:title "BBC Vamp Plugins"  ; 
+    dc:description "A collection of audio feature extraction algorithms from BBC Research and Development" ;
+    foaf:page <https://github.com/bbcrd/bbc-vamp-plugins/blob/master/README.md> ;
+    doap:download-page <https://github.com/bbcrd/bbc-vamp-plugins/releases> ;
     vamp:available_plugin plugbase:bbc-energy ; 
-    vamp:available_plugin plugbase:bbc-intensity ; 
+    vamp:available_plugin plugbase:bbc-intensity ;  
+    vamp:available_plugin plugbase:bbc-peaks ; 
     vamp:available_plugin plugbase:bbc-rhythm ; 
     vamp:available_plugin plugbase:bbc-spectral-contrast ; 
     vamp:available_plugin plugbase:bbc-spectral-flux ; 
     vamp:available_plugin plugbase:bbc-speechmusic-segmenter ; 
-#   foaf:page <Place more-information HTML page URL here and uncomment> ;
+    vamp:has_source true ;
+    vamp:has_binary "linux32" ;
+    vamp:has_binary "linux64" ;
+    vamp:has_binary "win32" ;
+    vamp:has_binary "osx" 
     .
 
 plugbase:bbc-energy a   vamp:Plugin ;
     dc:title              "Energy" ;
     vamp:name             "Energy" ;
-    dc:description        """""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates the RMS energy and low energy ratio of a signal""" ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2013 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-energy" ;
     vamp:vamp_API_version vamp:api_version_2 ;
-    owl:versionInfo       "2" ;
+    owl:versionInfo       "3" ;
     vamp:input_domain     vamp:TimeDomain ;
 
+    vamp:parameter   plugbase:bbc-energy_param_root ;
+    vamp:parameter   plugbase:bbc-energy_param_avgwindow ;
+    vamp:parameter   plugbase:bbc-energy_param_avgpercentile ;
+    vamp:parameter   plugbase:bbc-energy_param_dipthresh ;
     vamp:parameter   plugbase:bbc-energy_param_threshold ;
-    vamp:parameter   plugbase:bbc-energy_param_root ;
 
     vamp:output      plugbase:bbc-energy_output_rmsenergy ;
+    vamp:output      plugbase:bbc-energy_output_rmsdelta ;
     vamp:output      plugbase:bbc-energy_output_lowenergy ;
-    .
-plugbase:bbc-energy_param_threshold a  vamp:Parameter ;
-    vamp:identifier     "threshold" ;
-    dc:title            "Low energy threshold" ;
-    dc:format           "" ;
-    vamp:min_value       0 ;
-    vamp:max_value       10 ;
-    vamp:unit           ""  ;
-    vamp:default_value   1 ;
-    vamp:value_names     ();
+    vamp:output      plugbase:bbc-energy_output_average ;
+    vamp:output      plugbase:bbc-energy_output_pdip ;
     .
 plugbase:bbc-energy_param_root a  vamp:QuantizedParameter ;
     vamp:identifier     "root" ;
@@ -63,6 +73,46 @@
     vamp:default_value   1 ;
     vamp:value_names     ();
     .
+plugbase:bbc-energy_param_avgwindow a  vamp:Parameter ;
+    vamp:identifier     "avgwindow" ;
+    dc:title            "Moving average window size" ;
+    dc:format           "seconds" ;
+    vamp:min_value       0.001 ;
+    vamp:max_value       10 ;
+    vamp:unit           "seconds"  ;
+    vamp:default_value   1 ;
+    vamp:value_names     ();
+    .
+plugbase:bbc-energy_param_avgpercentile a  vamp:Parameter ;
+    vamp:identifier     "avgpercentile" ;
+    dc:title            "Moving average percentile" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       100 ;
+    vamp:unit           ""  ;
+    vamp:default_value   3 ;
+    vamp:value_names     ();
+    .
+plugbase:bbc-energy_param_dipthresh a  vamp:Parameter ;
+    vamp:identifier     "dipthresh" ;
+    dc:title            "Dip threshold" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       10 ;
+    vamp:unit           ""  ;
+    vamp:default_value   3 ;
+    vamp:value_names     ();
+    .
+plugbase:bbc-energy_param_threshold a  vamp:Parameter ;
+    vamp:identifier     "threshold" ;
+    dc:title            "Low energy threshold" ;
+    dc:format           "" ;
+    vamp:min_value       0 ;
+    vamp:max_value       10 ;
+    vamp:unit           ""  ;
+    vamp:default_value   1 ;
+    vamp:value_names     ();
+    .
 plugbase:bbc-energy_output_rmsenergy a  vamp:DenseOutput ;
     vamp:identifier       "rmsenergy" ;
     dc:title              "RMS Energy" ;
@@ -74,6 +124,17 @@
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
+plugbase:bbc-energy_output_rmsdelta a  vamp:DenseOutput ;
+    vamp:identifier       "rmsdelta" ;
+    dc:title              "RMS Energy Delta" ;
+    dc:description        """Difference between RMS of previous and current blocks."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        1 ;
+#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
+#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .
 plugbase:bbc-energy_output_lowenergy a  vamp:SparseOutput ;
     vamp:identifier       "lowenergy" ;
     dc:title              "Low Energy" ;
@@ -86,11 +147,33 @@
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
+plugbase:bbc-energy_output_average a  vamp:DenseOutput ;
+    vamp:identifier       "average" ;
+    dc:title              "Moving Average" ;
+    dc:description        """Mean of RMS values over moving average window."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        1 ;
+#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
+#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .
+plugbase:bbc-energy_output_pdip a  vamp:DenseOutput ;
+    vamp:identifier       "pdip" ;
+    dc:title              "Dip probability" ;
+    dc:description        """Probability of the RMS energy dipping below the threshold."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        1 ;
+#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
+#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .
 plugbase:bbc-intensity a   vamp:Plugin ;
     dc:title              "Intensity" ;
     vamp:name             "Intensity" ;
-    dc:description        """""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates the intensity of a signal and the intensity ratio for a number of sub-bands""" ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2013 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-intensity" ;
@@ -137,11 +220,35 @@
 #   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
 #   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
     .
+plugbase:bbc-peaks a   vamp:Plugin ;
+    dc:title              "Peaks" ;
+    vamp:name             "Peaks" ;
+    dc:description        """Calculates peak and trough values of a signal""" ;
+    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:rights             """(c) 2014 British Broadcasting Corporation""" ;
+#   cc:license            <Place plugin license URI here and uncomment> ; 
+    vamp:identifier       "bbc-peaks" ;
+    vamp:vamp_API_version vamp:api_version_2 ;
+    owl:versionInfo       "1" ;
+    vamp:input_domain     vamp:TimeDomain ;
+    vamp:output      plugbase:bbc-peaks_output_peaks ;
+    .
+plugbase:bbc-peaks_output_peaks a  vamp:DenseOutput ;
+    vamp:identifier       "peaks" ;
+    dc:title              "Peaks" ;
+    dc:description        """Peak and trough, in order of occurance."""  ;
+    vamp:fixed_bin_count  "true" ;
+    vamp:unit             "" ;
+    vamp:bin_count        1 ;
+#   vamp:computes_event_type   <Place event type URI here and uncomment> ;
+#   vamp:computes_feature      <Place feature attribute URI here and uncomment> ;
+#   vamp:computes_signal_type  <Place signal type URI here and uncomment> ;
+    .
 plugbase:bbc-rhythm a   vamp:Plugin ;
     dc:title              "Rhythm" ;
     vamp:name             "Rhythm" ;
-    dc:description        """""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates rhythmic features of a signal, including onsets and tempo """ ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2013 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-rhythm" ;
@@ -356,8 +463,8 @@
 plugbase:bbc-spectral-contrast a   vamp:Plugin ;
     dc:title              "Spectral Contrast" ;
     vamp:name             "Spectral Contrast" ;
-    dc:description        """""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates the peak and valleys of the spectral contrast feature""" ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2013 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-spectral-contrast" ;
@@ -430,8 +537,8 @@
 plugbase:bbc-spectral-flux a   vamp:Plugin ;
     dc:title              "Spectral Flux" ;
     vamp:name             "Spectral Flux" ;
-    dc:description        """""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates the spectral flux""" ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2013 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-spectral-flux" ;
@@ -469,8 +576,8 @@
 plugbase:bbc-speechmusic-segmenter a   vamp:Plugin ;
     dc:title              "Speech/Music segmenter" ;
     vamp:name             "Speech/Music segmenter" ;
-    dc:description        """A simple speech/music segmenter""" ;
-    foaf:maker            [ foaf:name "BBC" ] ; # FIXME could give plugin author's URI here
+    dc:description        """Calculates boundaries between speech and music""" ;
+    foaf:maker            :maker ;
     dc:rights             """(c) 2011 British Broadcasting Corporation""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bbc-speechmusic-segmenter" ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/beatroot-vamp.n3
--- a/plugins/beatroot-vamp.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/beatroot-vamp.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -13,10 +13,18 @@
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/beatroot-vamp> .
 
-:beatroot-vamp a  vamp:PluginLibrary ;
+:maker
+    foaf:name "Queen Mary, University of London" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <http://c4dm.eecs.qmul.ac.uk/> .
+
+plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "beatroot-vamp"  ; 
     vamp:available_plugin plugbase:beatroot ; 
     foaf:page <http://code.soundsoftware.ac.uk/projects/beatroot-vamp> ;
+    foaf:maker :maker ;
+    dc:title "BeatRoot" ;
+    dc:description "A plugin implementation of the BeatRoot beat tracking system" ;
     .
 
 plugbase:beatroot a   vamp:Plugin ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/extra-categories.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/extra-categories.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -0,0 +1,89 @@
+@prefix vamp: <http://purl.org/ontology/vamp/> .
+@prefix : <#> .
+
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-energy> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-intensity> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-peaks> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-rhythm> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-spectral-contrast> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-spectral-flux> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/bbc-vamp-plugins#bbc-speechmusic-segmenter> vamp:category "Classification" .
+<http://vamp-plugins.org/rdf/plugins/beatroot-vamp#beatroot> vamp:category "Time > Tempo" .
+<http://vamp-plugins.org/rdf/plugins/cqvamp#cqvamp> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/match-vamp-plugin#match> vamp:category "Time > Alignment" .
+<http://vamp-plugins.org/rdf/plugins/nnls-chroma#chordino> vamp:category "Notes" .
+<http://vamp-plugins.org/rdf/plugins/nnls-chroma#nnls-chroma> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/nnls-chroma#tuning> vamp:category "Key and Tonality" .
+<http://vamp-plugins.org/rdf/plugins/pyin#pyin> vamp:category "Pitch" .
+<http://vamp-plugins.org/rdf/plugins/pyin#yin> vamp:category "Pitch" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-adaptivespectrogram> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-barbeattracker> vamp:category "Time > Tempo" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-chromagram> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-constantq> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-dwt> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-keydetector> vamp:category "Key and Tonality" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-mfcc> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-onsetdetector> vamp:category "Time > Onsets" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-segmenter> vamp:category "Classification" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-similarity> vamp:category "Classification" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-tempotracker> vamp:category "Time > Tempo" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-tonalchange> vamp:category "Key and Tonality" .
+<http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins#qm-transcription> vamp:category "Notes" .
+<http://vamp-plugins.org/rdf/plugins/vamp-aubio#aubionotes> vamp:category "Notes" .
+<http://vamp-plugins.org/rdf/plugins/vamp-aubio#aubioonset> vamp:category "Time > Onsets" .
+<http://vamp-plugins.org/rdf/plugins/vamp-aubio#aubiopitch> vamp:category "Pitch" .
+<http://vamp-plugins.org/rdf/plugins/vamp-aubio#aubiosilence> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-aubio#aubiotempo> vamp:category "Time > Tempo" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#amplitudefollower> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#fixedtempo> vamp:category "Time > Tempo" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets> vamp:category "Time > Onsets" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#powerspectrum> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#spectralcentroid> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#zerocrossing> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#amdf> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#asdf> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#autocorrelation> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#average_deviation> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#bark_coefficients> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#crest> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#dct> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#f0> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#failsafe_f0> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#flatness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#harmonic_spectrum> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#highest_value> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#irregularity_j> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#irregularity_k> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#kurtosis> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#loudness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#lowest_value> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#mean> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#mfcc> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#noisiness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#nonzero_count> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#odd_even_ratio> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#peak_spectrum> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#rms_amplitude> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#rolloff> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#sharpness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#skewness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#smoothness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_centroid> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_inharmonicity> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_kurtosis> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_skewness> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_slope> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_standard_deviation> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectral_variance> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spectrum> vamp:category "Visualisation" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#spread> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#standard_deviation> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#sum> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#tonality> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#tristimulus_1> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#tristimulus_2> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#tristimulus_3> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#variance> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#wavelet_f0> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-libxtract#zcr> vamp:category "Low Level Features" .
+<http://vamp-plugins.org/rdf/plugins/vamp-rubberband#rubberband> vamp:category "Time > Timestretch Analysis" .
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/mazurka-plugins.n3
--- a/plugins/mazurka-plugins.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/mazurka-plugins.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -6,6 +6,7 @@
 @prefix dc:       <http://purl.org/dc/elements/1.1/> .
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix cc:       <http://web.resource.org/cc/> .
 @prefix :         <#> .
 
@@ -13,22 +14,32 @@
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/mazurka-plugins> .
 
-:mazurka-plugins a  vamp:PluginLibrary ;
+:maker 
+    foaf:name "The Mazurka Project" ;
+    foaf:page <http://www.mazurka.org.uk/> .
+
+plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "mazurka-plugins"  ; 
+    dc:title "Mazurka Plugins" ;
+    dc:description "Spectral visualisation and feature extraction plugins from the Mazurka project" ;
+    foaf:maker :maker ;
+    foaf:page <http://www.mazurka.org.uk/software/sv/plugin/> ;
+    doap:download-page <http://www.mazurka.org.uk/software/sv/plugin/download/> ;
+    vamp:has_binary "win32" ;
+    vamp:has_binary "linux32" ;
     vamp:available_plugin plugbase:mzchronogram ; 
     vamp:available_plugin plugbase:mzharmonicspectrum ; 
     vamp:available_plugin plugbase:mznevermore ; 
     vamp:available_plugin plugbase:mzpowercurve ; 
     vamp:available_plugin plugbase:mzspectralflux ; 
     vamp:available_plugin plugbase:mzspectralreflux ; 
-#   foaf:page <Place more-information HTML page URL here and uncomment> ;
     .
 
 plugbase:mzchronogram a   vamp:Plugin ;
     dc:title              "Chronogram" ;
     vamp:name             "Chronogram" ;
     dc:description        """Chronogram""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mzchronogram" ;
@@ -124,7 +135,7 @@
     dc:title              "Harmonic Spectrogram" ;
     vamp:name             "Harmonic Spectrogram" ;
     dc:description        """Harmonic Spectrogram""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mzharmonicspectrum" ;
@@ -262,7 +273,7 @@
     dc:title              "Nevermore Spectrogram" ;
     vamp:name             "Nevermore Spectrogram" ;
     dc:description        """Nevermore Spectrogram""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mznevermore" ;
@@ -407,7 +418,7 @@
     dc:title              "Power Curve" ;
     vamp:name             "Power Curve" ;
     dc:description        """Power Curve""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mzpowercurve" ;
@@ -530,7 +541,7 @@
     dc:title              "Spectral Flux" ;
     vamp:name             "Spectral Flux" ;
     dc:description        """Spectral Flux""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mzspectralflux" ;
@@ -725,7 +736,7 @@
     dc:title              "Spectral Reflux" ;
     vamp:name             "Spectral Reflux" ;
     dc:description        """Spectral Reflux""" ;
-    foaf:maker            [ foaf:name "The Mazurka Project" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """2006 Craig Stuart Sapp""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mzspectralreflux" ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/mtg-melodia.n3
--- a/plugins/mtg-melodia.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/mtg-melodia.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -6,6 +6,7 @@
 @prefix dc:       <http://purl.org/dc/elements/1.1/> .
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix cc:       <http://web.resource.org/cc/> .
 @prefix :         <#> .
 
@@ -13,11 +14,25 @@
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/mtg-melodia> .
 
-:mtg-melodia a  vamp:PluginLibrary ;
+:maker
+    foaf:name "Music Technology Group, Universitat Pompeu Fabra" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/upf.png> ;
+    foaf:page <http://mtg.upf.edu/> .
+
+plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "mtg-melodia"  ; 
     vamp:available_plugin plugbase:melodia ; 
     vamp:available_plugin plugbase:melodiaviz ; 
     foaf:page <http://mtg.upf.edu/technologies/melodia> ;
+    dc:title "MELODIA - Melody Extraction" ;
+    dc:description "Melody pitch estimator for polyphonic music" ;
+    doap:download-page <http://mtg.upf.edu/technologies/melodia?p=Download%20and%20installation> ;
+    foaf:maker :maker ;
+    vamp:has_source false ;
+    vamp:has_binary "win32" ;
+    vamp:has_binary "osx" ;
+    vamp:has_binary "linux32" ;
+    vamp:has_binary "linux64" ;
     .
 
 plugbase:melodia a   vamp:Plugin ;
@@ -104,7 +119,7 @@
 J. Salamon and E. Gomez, "Melody Extraction from Polyphonic Music Signals using Pitch Contour Characteristics", IEEE Transactions on Audio, Speech and Language Processing, 20(6):1759-1770, 2012.
 
 We would highly appreciate the above reference being cited in publications of work in which this plug-in was used.""" ;
-    foaf:maker            [ foaf:name "Music Technology Group, Universitat Pompeu Fabra" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Justin Salamon. Copyright (c) Music Technology Group, Universitat Pompeu Fabra - All Rights Reserved""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "melodiaviz" ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/ofa-vamp-plugin.n3
--- a/plugins/ofa-vamp-plugin.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/ofa-vamp-plugin.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -17,7 +17,11 @@
 :ofa-vamp-plugin a  vamp:PluginLibrary ;
     vamp:identifier "ofa-vamp-plugin" ; 
     vamp:available_plugin plugbase:ofa_fingerprint; 
-    vamp:available_plugin plugbase:ofa_puid .
+    vamp:available_plugin plugbase:ofa_puid ;
+    foaf:maker            [ foaf:name "Chris Cannam, using MusicIP OFA library" ] ;
+    dc:title "OFA Vamp Plugin" ;
+    dc:description "Plugin that performs audio fingerprinting and lookup using the MusicIP OFA library"
+    .
 
 plugbase:ofa_fingerprint a   vamp:Plugin ;
     dc:title              "MusicIP Audio Fingerprinter" ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/qm-vamp-plugins.n3
--- a/plugins/qm-vamp-plugins.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/qm-vamp-plugins.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -7,14 +7,22 @@
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
 @prefix cc:       <http://web.resource.org/cc/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix :         <#> .
 
 <>  a   vamp:PluginDescription ;
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/qm-vamp-plugins> .
 
-:qm-vamp-plugins a  vamp:PluginLibrary ;
+:maker
+    foaf:name "Queen Mary, University of London" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <http://c4dm.eecs.qmul.ac.uk/> .
+
+plugbase:library a  vamp:PluginLibrary ;
     vamp:identifier "qm-vamp-plugins"  ; 
+    dc:title "Queen Mary plugin set" ;
+    foaf:maker :maker ;
     vamp:available_plugin plugbase:qm-adaptivespectrogram ; 
     vamp:available_plugin plugbase:qm-barbeattracker ; 
     vamp:available_plugin plugbase:qm-chromagram ; 
@@ -29,18 +37,22 @@
     vamp:available_plugin plugbase:qm-tonalchange ; 
     vamp:available_plugin plugbase:qm-transcription ; 
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html> ;
-    .
+    doap:download-page <http://isophonics.net/QMVampPlugins> ;
+    dc:title "Queen Mary plugin set" ;
+    dc:description """Plugins from the Centre for Digital Music at Queen Mary, University of London""" .
 
 plugbase:qm-adaptivespectrogram a   vamp:Plugin ;
     dc:title              "Adaptive Spectrogram" ;
     vamp:name             "Adaptive Spectrogram" ;
+    vamp:category	  "Visualisation" ;
     dc:description        """Produce an adaptive spectrogram by adaptive selection from spectrograms at multiple resolutions""" ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Wen Xue and Chris Cannam.  Copyright (c) 2009 Wen Xue and QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-adaptivespectrogram" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
+    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-adaptivespectrogram> ;
 
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_n ;
     vamp:parameter   plugbase:qm-adaptivespectrogram_param_w ;
@@ -103,13 +115,15 @@
 plugbase:qm-barbeattracker a   vamp:Plugin ;
     dc:title              "Bar and Beat Tracker" ;
     vamp:name             "Bar and Beat Tracker" ;
+    vamp:category	  "Time > Tempo" ;
     dc:description        """Estimate bar and beat locations""" ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Matthew Davies, Christian Landone and Chris Cannam.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-barbeattracker" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
+    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-barbeattracker> ;
 
     vamp:parameter   plugbase:qm-barbeattracker_param_bpb ;
 
@@ -176,9 +190,10 @@
 plugbase:qm-chromagram a   vamp:Plugin ;
     dc:title              "Chromagram" ;
     vamp:name             "Chromagram" ;
+    vamp:category	  "Visualisation" ;
     dc:description        """Extract a series of tonal chroma vectors from the audio""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-chromagram> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Chris Cannam and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-chromagram" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -274,9 +289,10 @@
 plugbase:qm-constantq a   vamp:Plugin ;
     dc:title              "Constant-Q Spectrogram" ;
     vamp:name             "Constant-Q Spectrogram" ;
+    vamp:category	  "Visualisation" ;
     dc:description        """Extract a spectrogram with constant ratio of centre frequency to resolution from the input audio""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-constantq> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Chris Cannam and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-constantq" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -358,13 +374,15 @@
 plugbase:qm-dwt a   vamp:Plugin ;
     dc:title              "Discrete Wavelet Transform" ;
     vamp:name             "Discrete Wavelet Transform" ;
+    vamp:category	  "Visualisation" ;
     dc:description        """Visualisation by scalogram""" ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Thomas Wilmering.  Copyright (c) 2009 Thomas Wilmering and QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-dwt" ;
     vamp:vamp_API_version vamp:api_version_2 ;
     owl:versionInfo       "1" ;
     vamp:input_domain     vamp:TimeDomain ;
+    foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-dwt> ;
 
     vamp:parameter   plugbase:qm-dwt_param_scales ;
     vamp:parameter   plugbase:qm-dwt_param_wavelet ;
@@ -428,9 +446,10 @@
 plugbase:qm-keydetector a   vamp:Plugin ;
     dc:title              "Key Detector" ;
     vamp:name             "Key Detector" ;
+    vamp:category	  "Key and Tonality" ;
     dc:description        """Estimate the key of the music""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-keydetector> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Katy Noland and Christian Landone.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-keydetector" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -534,9 +553,10 @@
 plugbase:qm-mfcc a   vamp:Plugin ;
     dc:title              "Mel-Frequency Cepstral Coefficients" ;
     vamp:name             "Mel-Frequency Cepstral Coefficients" ;
+    vamp:category	  "Low Level Features" ;
     dc:description        """Calculate a series of MFCC vectors from the audio""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-mfcc> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Nicolas Chetry and Chris Cannam.  Copyright (c) 2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-mfcc" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -610,9 +630,10 @@
 plugbase:qm-onsetdetector a   vamp:Plugin ;
     dc:title              "Note Onset Detector" ;
     vamp:name             "Note Onset Detector" ;
+    vamp:category	  "Time > Onsets" ;
     dc:description        """Estimate individual note onset positions""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-onsetdetector> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Christian Landone, Chris Duxbury and Juan Pablo Bello.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-onsetdetector" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -698,9 +719,10 @@
 plugbase:qm-segmenter a   vamp:Plugin ;
     dc:title              "Segmenter" ;
     vamp:name             "Segmenter" ;
+    vamp:category	  "Classification" ;
     dc:description        """Divide the track into a sequence of consistent segments""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-segmenter> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Mark Levy.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-segmenter" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -766,9 +788,10 @@
 plugbase:qm-similarity a   vamp:Plugin ;
     dc:title              "Similarity" ;
     vamp:name             "Similarity" ;
+    vamp:category	  "Classification" ;
     dc:description        """Return a distance matrix for similarity between the input audio channels""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-similarity> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Mark Levy, Kurt Jacobson and Chris Cannam.  Copyright (c) 2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-similarity" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -870,9 +893,10 @@
 plugbase:qm-tempotracker a   vamp:Plugin ;
     dc:title              "Tempo and Beat Tracker" ;
     vamp:name             "Tempo and Beat Tracker" ;
+    vamp:category	  "Time > Tempo" ;
     dc:description        """Estimate beat locations and tempo""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tempotracker> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Christian Landone and Matthew Davies.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-tempotracker" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -958,9 +982,10 @@
 plugbase:qm-tonalchange a   vamp:Plugin ;
     dc:title              "Tonal Change" ;
     vamp:name             "Tonal Change" ;
+    vamp:category	  "Key and Tonality" ;
     dc:description        """Detect and return the positions of harmonic changes such as chord boundaries""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-tonalchange> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Martin Gasser and Christopher Harte.  Copyright (c) 2006-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-tonalchange" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1059,9 +1084,10 @@
 plugbase:qm-transcription a   vamp:Plugin ;
     dc:title              "Polyphonic Transcription" ;
     vamp:name             "Polyphonic Transcription" ;
+    vamp:category	  "Notes" ;
     dc:description        """Transcribe the input audio to estimated notes""" ;
     foaf:page <http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-transcription> ;
-    foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
+    foaf:maker            :maker ;
     dc:rights             """Plugin by Dr. Ruohua Zhou.  Copyright (c) 2008-2009 QMUL - All Rights Reserved""" ;
     vamp:identifier       "qm-transcription" ;
     vamp:vamp_API_version vamp:api_version_2 ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/segmentino.n3
--- a/plugins/segmentino.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/segmentino.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -7,21 +7,37 @@
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
 @prefix cc:       <http://web.resource.org/cc/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix :         <#> .
 
 <>  a   vamp:PluginDescription ;
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/segmentino> .
 
+:maker 
+    foaf:name "Queen Mary, University of London" ;
+    foaf:logo <http://vamp-plugins.org/rdf/plugins/makers/qm.png> ;
+    foaf:page <http://c4dm.eecs.qmul.ac.uk/> .
+
 :segmentino a  vamp:PluginLibrary ;
     vamp:identifier "segmentino"  ; 
     vamp:available_plugin plugbase:segmentino ; 
     foaf:page <http://code.soundsoftware.ac.uk/projects/segmenter-vamp-plugin> ;
+    foaf:maker :maker ;
+    dc:title "Segmentino" ;
+    dc:description """Plugin for automatic music structural segmentation""" ;
+    doap:download-page <http://code.soundsoftware.ac.uk/projects/segmenter-vamp-plugin/files> ;
+    vamp:has_source true ;
+    vamp:has_binary "linux32" ;
+    vamp:has_binary "linux64" ;
+    vamp:has_binary "win32" ;
+    vamp:has_binary "osx" 
     .
 
 plugbase:segmentino a   vamp:Plugin ;
     dc:title              "Segmentino" ;
     vamp:name             "Segmentino" ;
+    vamp:category	  "Classification" ;
     dc:description        """Estimate contiguous segments pertaining to song parts such as verse and chorus.""" ;
     foaf:maker            [ foaf:name "Queen Mary, University of London" ] ; # FIXME could give plugin author's URI here
     dc:rights             """Plugin by Matthew Davies, Christian Landone, Chris Cannam, Matthias Mauch and Massimiliano Zanoni  Copyright (c) 2006-2013 QMUL - Affero GPL""" ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/vamp-example-plugins.n3
--- a/plugins/vamp-example-plugins.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/vamp-example-plugins.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -22,6 +22,9 @@
     vamp:available_plugin plugbase:powerspectrum ; 
     vamp:available_plugin plugbase:spectralcentroid ; 
     vamp:available_plugin plugbase:zerocrossing ; 
+    foaf:maker            [ foaf:name "Vamp SDK Example Plugins" ] ;
+    dc:title "Vamp Example Plugins" ;
+    dc:description """Example plugins from the Vamp Plugin SDK"""
     .
 
 plugbase:amplitudefollower a   vamp:Plugin ;
diff -r 405bff5165dd -r 4964bfbcbcb4 plugins/vamp-libxtract.n3
--- a/plugins/vamp-libxtract.n3	Thu Jun 19 15:23:31 2014 +0100
+++ b/plugins/vamp-libxtract.n3	Thu Jun 19 15:24:09 2014 +0100
@@ -6,6 +6,7 @@
 @prefix dc:       <http://purl.org/dc/elements/1.1/> .
 @prefix af:       <http://purl.org/ontology/af/> .
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
+@prefix doap: 	  <http://usefulinc.com/ns/doap#> .
 @prefix cc:       <http://web.resource.org/cc/> .
 @prefix :         <#> .
 
@@ -13,8 +14,13 @@
     foaf:maker          <http://www.vamp-plugins.org/doap.rdf#template-generator> ;
     foaf:primaryTopic   <http://vamp-plugins.org/rdf/plugins/vamp-libxtract> .
 
+:maker
+    foaf:name "Chris Cannam and Jamie Bullock" .
+
 :vamp-libxtract a  vamp:PluginLibrary ;
     vamp:identifier "vamp-libxtract"  ; 
+    dc:title "Vamp libxtract plugins" ;
+    dc:description """Low-level feature extraction plugins using Jamie Bullock's libxtract library to provide around 50 spectral and other features""" ;
     vamp:available_plugin plugbase:amdf ; 
     vamp:available_plugin plugbase:asdf ; 
     vamp:available_plugin plugbase:autocorrelation ; 
@@ -61,15 +67,21 @@
     vamp:available_plugin plugbase:tristimulus_3 ; 
     vamp:available_plugin plugbase:variance ; 
     vamp:available_plugin plugbase:zcr ; 
-    foaf:page <http://libxtract.sourceforge.net/>
+    foaf:maker :maker ;
+    foaf:page <http://code.soundsoftware.ac.uk/projects/vamp-libxtract-plugins> ;
+    doap:download-page <http://code.soundsoftware.ac.uk/projects/vamp-libxtract-plugins/files> ;
+    vamp:has_source true ;
+    vamp:has_binary "osx" ;
+    vamp:has_binary "win32" ;
+    vamp:has_binary "linux64"
     .
 
 plugbase:amdf a   vamp:Plugin ;
     dc:title              "Average Magnitude Difference Function" ;
     vamp:name             "Average Magnitude Difference Function" ;
     dc:description        """Extract the AMDF of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "amdf" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -93,8 +105,8 @@
     dc:title              "Average Squared Difference Function" ;
     vamp:name             "Average Squared Difference Function" ;
     dc:description        """Extract the ASDF of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "asdf" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -118,8 +130,8 @@
     dc:title              "Autocorrelation" ;
     vamp:name             "Autocorrelation" ;
     dc:description        """Extract the autocorrelation of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "autocorrelation" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -143,8 +155,8 @@
     dc:title              "Average Deviation" ;
     vamp:name             "Average Deviation" ;
     dc:description        """Extract the average deviation of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "average_deviation" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -169,8 +181,8 @@
     dc:title              "Bark Coefficients" ;
     vamp:name             "Bark Coefficients" ;
     dc:description        """Extract bark coefficients from an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "bark_coefficients" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -195,8 +207,8 @@
     dc:title              "Spectral Crest Measure" ;
     vamp:name             "Spectral Crest Measure" ;
     dc:description        """Extract the spectral crest measure of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Peeters (2003). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Peeters (2003). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "crest" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -221,8 +233,8 @@
     dc:title              "Discrete Cosine Transform" ;
     vamp:name             "Discrete Cosine Transform" ;
     dc:description        """Extract the DCT of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "dct" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -246,8 +258,8 @@
     dc:title              "Fundamental Frequency" ;
     vamp:name             "Fundamental Frequency" ;
     dc:description        """Extract the fundamental frequency of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jamie Bullock. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jamie Bullock. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "f0" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -271,8 +283,8 @@
     dc:title              "Fundamental Frequency (failsafe)" ;
     vamp:name             "Fundamental Frequency (failsafe)" ;
     dc:description        """Extract the fundamental frequency of an audio signal (failsafe)""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jamie Bullock. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jamie Bullock. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "failsafe_f0" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -296,8 +308,8 @@
     dc:title              "Spectral Flatness" ;
     vamp:name             "Spectral Flatness" ;
     dc:description        """Extract the spectral flatness of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Tristan Jehan (2005). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Tristan Jehan (2005). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "flatness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -322,8 +334,8 @@
     dc:title              "Harmonic Spectrum" ;
     vamp:name             "Harmonic Spectrum" ;
     dc:description        """Extract the harmonics from an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "harmonic_spectrum" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -372,8 +384,8 @@
     dc:title              "Highest Value" ;
     vamp:name             "Highest Value" ;
     dc:description        """Extract the highest value from a given range""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "highest_value" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -398,8 +410,8 @@
     dc:title              "Irregularity II" ;
     vamp:name             "Irregularity II" ;
     dc:description        """Extract the irregularity (type II) of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jensen (1999). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Jensen (1999). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "irregularity_j" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -424,8 +436,8 @@
     dc:title              "Irregularity I" ;
     vamp:name             "Irregularity I" ;
     dc:description        """Extract the irregularity (type I) of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Krimphoff (1994). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Krimphoff (1994). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "irregularity_k" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -450,8 +462,8 @@
     dc:title              "Kurtosis" ;
     vamp:name             "Kurtosis" ;
     dc:description        """Extract the kurtosis of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "kurtosis" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -476,8 +488,8 @@
     dc:title              "Loudness" ;
     vamp:name             "Loudness" ;
     dc:description        """Extract the loudness of an audio signal from its spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Moore, Glasberg et al (2005). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Moore, Glasberg et al (2005). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "loudness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -502,8 +514,8 @@
     dc:title              "Lowest Value" ;
     vamp:name             "Lowest Value" ;
     dc:description        """Extract the lowest value from a given range""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "lowest_value" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -528,8 +540,8 @@
     dc:title              "Mean" ;
     vamp:name             "Mean" ;
     dc:description        """Extract the mean of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mean" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -554,8 +566,8 @@
     dc:title              "Mel-Frequency Cepstral Coefficients" ;
     vamp:name             "Mel-Frequency Cepstral Coefficients" ;
     dc:description        """Extract MFCC from an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Rabiner. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Rabiner. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "mfcc" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -652,8 +664,8 @@
     dc:title              "Noisiness" ;
     vamp:name             "Noisiness" ;
     dc:description        """Extract the noisiness of an audio  spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Tae Hong Park (2000). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Tae Hong Park (2000). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "noisiness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -702,8 +714,8 @@
     dc:title              "Non-zero count" ;
     vamp:name             "Non-zero count" ;
     dc:description        """Extract the number of non-zero elements in an input spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "nonzero_count" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -741,8 +753,8 @@
     dc:title              "Odd/even Harmonic Ratio" ;
     vamp:name             "Odd/even Harmonic Ratio" ;
     dc:description        """Extract the odd-to-even harmonic ratio of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "odd_even_ratio" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -791,8 +803,8 @@
     dc:title              "Peak Spectrum" ;
     vamp:name             "Peak Spectrum" ;
     dc:description        """Extract the spectral peaks from an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "peak_spectrum" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -830,8 +842,8 @@
     dc:title              "RMS Amplitude" ;
     vamp:name             "RMS Amplitude" ;
     dc:description        """Extract the RMS amplitude of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "rms_amplitude" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -855,8 +867,8 @@
     dc:title              "Spectral Rolloff" ;
     vamp:name             "Spectral Rolloff" ;
     dc:description        """Extract the rolloff point of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Bee Suan Ong (2005). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Bee Suan Ong (2005). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "rolloff" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -894,8 +906,8 @@
     dc:title              "Spectral Sharpness" ;
     vamp:name             "Spectral Sharpness" ;
     dc:description        """Extract the spectral sharpness of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "sharpness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -920,8 +932,8 @@
     dc:title              "Skewness" ;
     vamp:name             "Skewness" ;
     dc:description        """Extract the skewness of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "skewness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -946,8 +958,8 @@
     dc:title              "Spectral Smoothness" ;
     vamp:name             "Spectral Smoothness" ;
     dc:description        """Extract the spectral smoothness of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from McAdams (1999). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from McAdams (1999). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "smoothness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -972,8 +984,8 @@
     dc:title              "Spectral Average Deviation" ;
     vamp:name             "Spectral Average Deviation" ;
     dc:description        """Extract the average deviation of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_average_deviation" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -998,8 +1010,8 @@
     dc:title              "Spectral Centroid" ;
     vamp:name             "Spectral Centroid" ;
     dc:description        """Extract the spectral centroid of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_centroid" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1024,8 +1036,8 @@
     dc:title              "Inharmonicity" ;
     vamp:name             "Inharmonicity" ;
     dc:description        """Extract the inharmonicity of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_inharmonicity" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1063,8 +1075,8 @@
     dc:title              "Spectral Kurtosis" ;
     vamp:name             "Spectral Kurtosis" ;
     dc:description        """Extract the kurtosis of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_kurtosis" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1089,8 +1101,8 @@
     dc:title              "Spectral Skewness" ;
     vamp:name             "Spectral Skewness" ;
     dc:description        """Extract the skewness of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_skewness" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1115,8 +1127,8 @@
     dc:title              "Spectral Slope" ;
     vamp:name             "Spectral Slope" ;
     dc:description        """Extract the spectral slope of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_slope" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1141,8 +1153,8 @@
     dc:title              "Spectral Standard Deviation" ;
     vamp:name             "Spectral Standard Deviation" ;
     dc:description        """Extract the standard deviation of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_standard_deviation" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1167,8 +1179,8 @@
     dc:title              "Spectral Variance" ;
     vamp:name             "Spectral Variance" ;
     dc:description        """Extract the variance of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectral_variance" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1193,8 +1205,8 @@
     dc:title              "Spectrum" ;
     vamp:name             "Spectrum" ;
     dc:description        """Extract the spectrum of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spectrum" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1218,8 +1230,8 @@
     dc:title              "Spectral Spread" ;
     vamp:name             "Spectral Spread" ;
     dc:description        """Extract the spectral spread of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Norman Casagrande (2005). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Norman Casagrande (2005). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "spread" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1244,8 +1256,8 @@
     dc:title              "Standard Deviation" ;
     vamp:name             "Standard Deviation" ;
     dc:description        """Extract the standard deviation of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "standard_deviation" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1270,8 +1282,8 @@
     dc:title              "Sum of Values" ;
     vamp:name             "Sum of Values" ;
     dc:description        """Extract the sum of the values in a given range""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "sum" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1296,8 +1308,8 @@
     dc:title              "Tonality" ;
     vamp:name             "Tonality" ;
     dc:description        """Extract the tonality an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from J. D. Johnston (1988). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from J. D. Johnston (1988). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tonality" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1322,8 +1334,8 @@
     dc:title              "Tristimulus I" ;
     vamp:name             "Tristimulus I" ;
     dc:description        """Extract the tristimulus (type I) of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tristimulus_1" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1372,8 +1384,8 @@
     dc:title              "Tristimulus II" ;
     vamp:name             "Tristimulus II" ;
     dc:description        """Extract the tristimulus (type II) of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tristimulus_2" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1422,8 +1434,8 @@
     dc:title              "Tristimulus III" ;
     vamp:name             "Tristimulus III" ;
     dc:description        """Extract the tristimulus (type III) of an audio spectrum""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Method from Pollard and Jansson (1982). Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "tristimulus_3" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1472,8 +1484,8 @@
     dc:title              "Variance" ;
     vamp:name             "Variance" ;
     dc:description        """Extract the variance of a range of values""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "variance" ;
     vamp:vamp_API_version vamp:api_version_2 ;
@@ -1498,8 +1510,8 @@
     dc:title              "Zero Crossing Rate" ;
     vamp:name             "Zero Crossing Rate" ;
     dc:description        """Extract the zero crossing rate of an audio signal""" ;
-    foaf:maker            [ foaf:name "libxtract by Jamie Bullock (plugin by Chris Cannam)" ] ; # FIXME could give plugin author's URI here
-    vamp:copyright_note   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
+    foaf:maker            :maker ;
+    dc:rights   """Copyright 2006 Jamie Bullock, plugin Copyright 2006 Queen Mary, University of London. Distributed under the GNU General Public License""" ;
 #   cc:license            <Place plugin license URI here and uncomment> ; 
     vamp:identifier       "zcr" ;
     vamp:vamp_API_version vamp:api_version_2 ;