Adding math.js and other small changes