Maths v0.4 b

Heavy Updates