checking server and fixed bugs