some fixes
some fix in v1
many fixes on server
many fixes on server