refactored matches, activations and strategies, added documentation