Updated TODO and close X-Accel