Expressions retooled, style changes, arithmatic added