Many fixes for math expressions, 'if' and 'else'. Also 'else if' construction added.