added syntax and normalization for addition and conditionals