Added redo for server and client, also did some cleanup in server