Add metronic demo, clean up.