some fixes
+ server (proto)