some fixes to parser to main programs with 'contains' blocks, some other parser tweaks
refactoring of analysis pipeline; work on typing