fixed file names and database issues