enhanced server capabilities, some renaming and todos added