Math is more robust now. No segfaults %)