Cleanup, bugfixes, added tags to Experiment.