more changes, trying to get db to work