Updated db, dataio and classes.php