modify some stuff to made the server work