More math expressions, added some rule matching for some basic expressions.

Signed-off-by: Andrew Porter <mephisto83@hotmail.com>