Fixed research for server and worked on assembly system