Several changes in the DB. Some small fixes in classes.