Adding static extractor, adjusting a few comments