Updated analyzer, parser

Some boolean expressions should be working now