New database files from scripts. Cleaned up debug style.