Lots of fixes - context-sensitivity is now on and CSP analysis included