fix several issues + add priority for server watchers