Added statistics to client and server side + completed validation