math

0c973c92 - Address review and tune more syntax