simplify echo server example + TODO/FIXME comments