database included
added error messages