fixed
server
server logic
refactoring