improved server and client a lot, but currently not working