bug fixes on server