Maths v1.7

Heavy Updates