a few changes to make server logging better