@ math fixes