Bridge between server and client
Fixed minor stuff