made some changes so it could work w/o servers.