More changes to database and improvements.