db_name defined
minor changes