indicator extractor and a few type tweaks