serverinfo added + refactoring