added full database, minor changes