added magics and kwarg matcher