Fixes Error, class, Math.S errors