#54 repair some to make simple server