fixed server and database issue